diff --git a/arch/arm/cpu/tegra20-common/funcmux.c b/arch/arm/cpu/tegra20-common/funcmux.c
index b2129ad..00b8029 100644
--- a/arch/arm/cpu/tegra20-common/funcmux.c
+++ b/arch/arm/cpu/tegra20-common/funcmux.c
@@ -235,9 +235,26 @@
 		break;
 
 	case PERIPH_ID_NDFLASH:
-		if (config == FUNCMUX_NDFLASH_ATC) {
+		switch (config) {
+		case FUNCMUX_NDFLASH_ATC:
 			pinmux_set_func(PINGRP_ATC, PMUX_FUNC_NAND);
 			pinmux_tristate_disable(PINGRP_ATC);
+			break;
+		case FUNCMUX_NDFLASH_KBC_8_BIT:
+			pinmux_set_func(PINGRP_KBCA, PMUX_FUNC_NAND);
+			pinmux_set_func(PINGRP_KBCC, PMUX_FUNC_NAND);
+			pinmux_set_func(PINGRP_KBCD, PMUX_FUNC_NAND);
+			pinmux_set_func(PINGRP_KBCE, PMUX_FUNC_NAND);
+			pinmux_set_func(PINGRP_KBCF, PMUX_FUNC_NAND);
+
+			pinmux_tristate_disable(PINGRP_KBCA);
+			pinmux_tristate_disable(PINGRP_KBCC);
+			pinmux_tristate_disable(PINGRP_KBCD);
+			pinmux_tristate_disable(PINGRP_KBCE);
+			pinmux_tristate_disable(PINGRP_KBCF);
+
+			bad_config = 0;
+			break;
 		}
 		break;
 
diff --git a/arch/arm/include/asm/arch-tegra20/funcmux.h b/arch/arm/include/asm/arch-tegra20/funcmux.h
index bd511db..c986b93 100644
--- a/arch/arm/include/asm/arch-tegra20/funcmux.h
+++ b/arch/arm/include/asm/arch-tegra20/funcmux.h
@@ -60,6 +60,7 @@
 
 	/* NAND flags */
 	FUNCMUX_NDFLASH_ATC = 0,
+	FUNCMUX_NDFLASH_KBC_8_BIT,
 };
 
 /**